Merge "Retain device during connecting state" into jb-dev