Merge "Revert "Manual revert of 5s FGS notification enforcement""