[automerger skipped] Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden" into pi-dev am: b6c84d1135
am: 8c7b9a0847  -s ours

Change-Id: Ifd1a9c468c39b50a41c01e3342150805aaf5cb03