Merge "fix(#AlwaysOnMagnifier): Fix testSetConfigWithActivatedFalse_expectedConfig fails"