Merge "More userActivity() calls in keyguard" into jb-mr1-dev