Merge "Merge "Fix exception caused by system app setting wallpaper" am: aa33e703 am: 2b40eb94 am: 62f11f57 am: f79c2108 am: 3d3e0802"