Merge "Make FGS notification deferral control tri-state" into sc-dev