Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev