am b122add7: am d0ed52f1: am 6db70c4e: am de4fbccb: Merge "Synchronize MailPrefs getter and match default values" into ub-gmail-ur14-dev

* commit 'b122add77306ba74caa1fa02feb17630e64478e3':
  Synchronize MailPrefs getter and match default values