Merge "make scroll position compensation more reliable" into jb-ub-mail-ur8