Merge "WM: Mark screen rotation layer as opaque" into sc-dev