Fix #6968, saving/rollbacking edits deselects current editing tool

For review by Nathan (and anyone else who wants to test).

Should fix http://hub.qgis.org/issues/6968