Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev