Merge "Fix focus indicator slightly off center during CAF" into gb-ub-photos-denali