Merge "Don't allow for drag during mode change" into ub-gmail-ur14-dev