Merge "Solve flakiness of RadioOnStateListenerTest" into rvc-dev