Merge "chore(#AlwaysOnMagnifier): Replace string constant with Settings Pref Key"