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

* commit 'c8ed8d32603d21e1af9a682cc5f1655d2388cfba':
  Adding user activity when the challenge is slid down