am 2fea92e6: Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev

* commit '2fea92e6d93b02de67534a9e397a73654d74ce94':
  Clear ident in dismissKeyguardOnNextActivity().