Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev