Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev