Merge "Attempt to fix bug on devices where multi-user support is disabled." into jb-mr1-lockscreen-dev