Merge "Fix DirectActionsTest instant mode failure." into sc-dev