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

Change-Id: I6da47cfa76c724891f8090e4566a98c450777e4f