Merge "unify preview and bottom bar resizing code move bottom bar button into own layout files" into gb-ub-photos-denali