Bug 1015450 - Prevent toolbar from going into an inconsistent state when tapped when entering editing mode. r=lucasr