Merge "Teach FGS notification deferral about service types" into sc-dev