Merge "Fix DisplayRepository defaultDisplayOff" into main