Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-dev