Merge "Remove SignalClusterView and signal_cluster_view"