Merge "adjusted capture button highlight as per comments in b/12560596" into gb-ub-photos-denali