Merge "Add a flag for display content mode management" into main