Merge "Update the new SYSTEM_ALERT_WINDOW check for FGS." into main