Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden" into pi-dev
am: b6c84d1135

Change-Id: I9d1a24f1adf5c3dd192c26c563e0c56cf1651840