Merge "Merge "WM: Mark screen rotation layer as opaque" into sc-dev am: 0afea057 am: 25723dbf" into sc-v2-dev-plus-aosp