Merge "Fix per-display flags propagation in flexiglass" into main