Merge "Ensure PhoneConfigurationManager registrants are cleared after testing"