Merge "Prevent refocus after entering touch mode" into klp-dev