Merge "Stop StkAppService when no CatService is available"