Merge "Add the missing lock on the process start timeout handling" into tm-dev