Merge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev