am 12fe6231: Merge "Update "Sync Gmail" preference" into jb-ub-mail-ur10

* commit '12fe62319d3ee92aeca408ed6ed2572b48313dff':
  Update "Sync Gmail" preference