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

Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957