Merge "Allow DisplayContent children to be removed on display removal"