Merge "Improved multiuser support for A11y button/Magnification" into oc-dev