am 0159508d: Merge "Fix some jank" into jb-ub-mail-ur8

* commit '0159508d07186a3bf9fcc9a7227047f1bd82084d':
  Fix some jank