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