Merge "Merge "Move DimLayer to Root if translucent window and not multi-window" into rvc-dev am: 2d8d9812e9 am: c6c9af373e" into rvc-d1-dev-plus-aosp