Merge pull request #13758 from Raroun/frio_More_space_between_photo_permissions_and_s...