Merge "Fix flakiness in getIconPosition test" into tm-qpr-dev