am 88a23f2f: Merge ""Fixing backwards cmpatibility for enabling explore by touch"""

# Via Android (Google) Code Review (1) and Svetoslav Ganov (1)
* commit '88a23f2f70222459f057ec8a6bbe8eccc8a7b549':
  "Fixing backwards cmpatibility for enabling explore by touch""