Merge change Ice325f3b into eclair-mr2

* changes:
  Fix Notepadv3Solution orientation changes during NoteEdit