Change 215838 had a related patch set uploaded (by Catrope):
Only change editor preference if user makes a change

https://gerrit.wikimedia.org/r/215838

Change 215838 merged by jenkins-bot:
Only change editor preference if user makes a change

https://gerrit.wikimedia.org/r/215838

• https://gerrit.wikimedia.org/r/215838 (branch master): WMF-deploy-2015-06-09_(1.26wmf9)

If no changes are made with the editor - the editor preference is not changed.

Testing scenario:

1. a user has VE(or markup) mode for editing
2. switch to markup(or VE) - do not do any editing
3. click on 'Cancel' or 'Save changes'
4. re-login and check if the editor preference is changed

Checked for the following cases

Hello Etonkovidova - your chart is not matching my situation. I use markup by default (i.e., I have VE disabled at present) - this is the choice I make in my personal editing preferences. But when I am using a browser that supports VE, the default editing option I get for Flow is VE, not markup. It should be markup, with the option to toggle to VE.

As well, even when I am editing in markup, when I preview and then return to editing, I am always switched to VE instead of returning to markup. This is consistent whenever I am using a browser that supports VE.

Risker: I checked the scenarios you described

1. disabled VE in Preferences. Then, when I go to Talk pages, they still have VE enabled for editing - yes, it still is happening. I'll discuss it with the team if it's an issue.

2. The following issue has been fixed in beta testing environment.

even when I am editing in markup, when I preview and then return to editing, I am always switched to VE instead of returning to markup

For #1 - VE features on Flow pages(with disabled VE editor user preference) in fact, serve as a preview.

Works on Beta