Merge "Rename CatalystScreenTestCase.context" into main