Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce