Merge "TouchMode (6.2/n) Fully detaching touch mode from focus event (native)"