Merge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev am: f4849e9848
am: 50aa4b01bf

Change-Id: I9e576d05a2edb43daded10dd185bf327310b5779