Merge "Make undo bar a bit wider to be more consistent with Android conventions." into gb-ub-photos-denali