Merge "[TouchLatency] Add intent extra arg to set the mode on start" into main