am 97273d50: Merge "Fixing backwards cmpatibility for enabling explore by touch"

# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '97273d50ce5b5689a1c787ebfed2ba3927de085a':
  Fixing backwards cmpatibility for enabling explore by touch