Merge "[Sb refactor] Ignore old pipeline callbacks to removeIcon*" into tm-qpr-dev