Merge "Add callbacks for connection status. Including some fixes to documentation and annotations."