Merge "Fix live wallpaper issue when set to lock screen" into main