Merge "Enable catalyst test for NetworkDashboardScreenTest" into main