Merge "Fix ScreenDecorations user switch bug" into rvc-dev