Merge "SurfaceFlinger: Limit to 4k Layers" into mnc-dev