Merge "[SB] Finish cleaning up icon callbacks in SBIconController." into main