Merge "Add menu labels" into gb-ub-photos-bryce