Merge "Limit maxGxpDebugDumps to 4" into main