Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev