Merge "Remove tap to click from touch nav devices" into klp-dev