Merge "Better comments for the CONNECTING state." into lmp-dev