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