Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev