am a617809d: am 74fcd240: Merge "Don\'t allow for drag during mode change" into ub-gmail-ur14-dev

* commit 'a617809ddde8e11fa54be9530303179be2f54d55':
  Don't allow for drag during mode change