Merge "Disconnect from AP when teardown requested." into jb-mr2-dev