Merge "fix phantom tap interference on tablet w/ open drawer" into ub-gmail-ur14-dev