Merge "Allow workspace to provide icon positions in tests" into tm-dev