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

Change-Id: I29fabb3f1752b2235c331753a9152e994bcc254c