Merge "Fix race condition of lazy service binding" into tm-dev