Merge "Change condition for entering in touchMode"