Merge "Avoid clobbering of YUV layout for flexible formats"