Merge "Retire preliminary FGS deferral control API" into sc-dev