Merge "Fix InTouchMode is not consistent between WMS and InputFlinger"