Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches