Restore UI after reconnect
Merge remote-tracking branch 'upstream/master'
Adding error message and grunt fix