Bug 874155 - [SMS] Properly exit edit-mode across all transitions