Merge "Refactor DisplayContent supportsSystemDecorations" into main