Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev