Update notes for submitted changes

* Properly handle initial connection failures.
Update notes for submitted changes

* Cleanup: Remove shared pref settings instead of overwriting them with dummy values.