Merge "Add setting for disabling swap." into pi-dev