Merge "Fix a problem where hwc and GL composition could show a different buffer"