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