Merge "SurfaceFlinger: Fix layer creation race"