Merge "Don't defer FGS notification if it's already shown" into sc-dev