Merge "Update keyguard to send userActivity events" into jb-mr1-dev