Merge "Create flag for sensor service" into main