Merge "Change to use ConfigurationContainer.onParentChanged"