Merge "Fix displayIdMirror test" into main