Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev