Merge "Add a root layer in DisplayContent"