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