Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev