Bug 1036210 - Recover the automatic connection once the manual connection is failed
Merge pull request #24681 from crh0716/1036210

Bug 1036210 - Recover the automatic connection once the manual connecon is failed r=eragonj