Merge "Keyguard sliding challenge - fix overeager touch interception" into jb-mr1-lockscreen-dev