Merge "Add getParentingSurfaceControl() in DisplayContent" into main