Merge "Handle missing ActivityTaskManager service" into main