Merge "Fix various FGS notification deferral issues" into sc-dev