Merge "Revert "[A11y] Allow magnifier to zoom to 20x by default"" into main