Merge "Adding support to add icons in the workspace for tests" into tm-qpr-dev