Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali