Merge "SurfaceFlinger: Propagate display flags correctly on creation"