Merge "Ensure PhoneConfigurationManager registrants are cleared after testing" into rvc-dev