Merge "[Catalyst] SIMs screen migration" into main