Merge "Update TODO bug in setInTouchMode"