Merge "Properly check MANAGE_EXTERNAL_STORAGE for wallpaper" into main