Merge "Roll forward of "Revert "TouchMode (5/n) Implementing onTouchModeChanged"""