Merge "Modified frame buffer handling"