am df794316: Merge "Clean up usage of Account.name when accessing account/folder prefs" into jb-ub-mail-ur10

* commit 'df794316cf4d57c4f07088992f285b692033aac0':
  Clean up usage of Account.name when accessing account/folder prefs