Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev