Merge "Add SDK compatibility code for new call states"