Merge "Auto connection/disconnection related changes" into jb-mr1-dev