Merge "Prevent BAL from Wallpaper Picker"