Merge "Adjust the set wallpaper dialog UI" into sc-dev