Merge "Introduce a new flag to enable crashing the app on FGS timeout." into main