fix for #117 Associate ServiceActivities with the screen they service