Merge "Revert "Revert "Defer FGS notifications from legacy apps by default"""