Merge "APIs for registering config activation broadcasts"