Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev