Merge "Fix flash when setting photo as wallpaper" into sc-v2-dev