am 50f0cba9: Merge "Sync disabled tip" into jb-ub-mail-ur10

* commit '50f0cba92ce2c2f45600cfd0e5184df84d3ab370':
  Sync disabled tip