Fixes the described problem, but breaks the row handles to delete and reorder that appear when going into edit mode. It shows them shortly and then animates them away as if edit mode was left immediately.