Merge "Skip reset wallpaper operation if users have changed wallpaper" into tm-dev