Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev