Merge "Adjust bottom control button positions." into gb-ub-photos-denali