Revert "Revert "Add misc wifi tweaks""

This reverts commit abb18e5302cd257cfac07bc75cabf39a97edb01f.