Merge "Make HotspotControllerImpl async"