Merge "Changes to restart supplicant on crash"