Merge "Remove SignalClusterView in favor of IconManager" into pi-dev