Merge "Update touch mode regardless of mStopped" into tm-dev