Merge changes from topic "redesignVariablesRole"

* changes:
  Apply the new design of mUserShortcutTypesCache & mUserShortcutTypes in Magnification
  Redesign roles of variable mUserShortcutTypesCache & mUserShortcutTypes