Merge "Fix exception caused by system app setting wallpaper"