Merge "Remove chooser_album_text flag" into main