Merge "Fix FGS notification mismatch" into sc-dev