Merge "db845c: Add deferred_probe_timeout=30 to the boot arguments"