Merge "Clear up the obsoleted cascading signal strength polling logic"