Merge "Prevent deadlock for clearWaitingDialog" into tm-dev