Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev