Merge "Fix setting Emoji wallpaper issue" into main