Merge "Refactor CSIT start/stop"