Merge "Fix @backupGlobals annotation in ExtensionRegistryTest"