Merge "Fix deadlock in ComponentAliasResolver" into tm-dev