Merge "Use correct shortcut preference key on Magnification screen" into main