Merge "Fix automatic Wi-fi toggle" into lmp-dev