Merge "Fix wallpaper flickering when turning screen off" into rvc-dev