Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali