Merge "ViewRootImpl: Correct opaque flag usage" into sc-dev