Merge "Fix ScreenDecorations user switch bug" into rvc-dev am: ec5dcbc2 am: 34a38029 am: 7df46d19 Change-Id: I37034b56d83e3f2d5f7f96b516830869ff0a9099