Merge "Fix race condition between Looper and destructor" into tm-dev