Merge "Use clearFocus() when entering touch mode"