Merge "Fix system-as-root detection on Pi"