Merge "[SB Refactor] Add a flag to enable/disable icon debug colors." into tm-qpr-dev