Merge "Rework: Move nailgun timeout patch to postinstall"