Merge "SF: Add a flag for the connected-display feature" into main