fix #4286: crash when rotating the phone while editing note
Merge branch 'release' into upstream