Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali