Merge "removing FR and IMM debug toggle buttons" into gb-ub-photos-denali