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

* commit 'b524f4b928fe3ac9c71657a323cff4b3321344da':
  add some defensive code to enableUserSelectorIfNecessary.