Merge "Fix wallpaper showing on AOD" into sc-dev