Merge "Fix bug #3366401 (Accounts in "Add accounts" list should be sorted alphabetically)" into honeycomb