am 2551bcfb: Merge "Remember our scroll position when we return to conv list" into jb-ub-mail-ur10

* commit '2551bcfb449a902a99a593390e90598d6e5f9fbc':
  Remember our scroll position when we return to conv list