Merge "Unregister configuration listener when remove container"