Merge "Unit tests for active config change broadcast"