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