Merge "Fix crash when calling sendTimeShiftMode"