Merge "Ignore catalyst test in DisplayScreenTest" into main