am c6a2fa8c: Merge "Disable assist gesture when keyguard is active" into jb-dev

* commit 'c6a2fa8cba32f5310a052cea2307b898f0522fab':
  Disable assist gesture when keyguard is active