Merge "ClientModeImpl: Don't enable RSSI polling on secondary CMM" into sc-dev