Telescopic baton extend/collapse message fix

Fixes #2840