Merge "Update the content description for toolbar's icon in PhotoPicker" into sc-mainline-prod