Merge "UI changes" into gb-ub-photos-bryce