Merge "Fix NPE when assistant component name is null" into tm-qpr-dev