Merge "Improved multiuser support for A11y button/Magnification" into oc-dev am: 9aa64e6cfa
am: 79bc410133

Change-Id: Ia5d0218553dd2a3d2f0a190f2d091e3180fe5773