Merge "Revert "Revert "Revert "Share radio settings across interfaces.""""