Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev