Merge "Revert "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade.""