Merge "Refactor SignalStrength"