Merge "Fix reconnect/reassociate handling" into jb-mr2-dev