am 4cc69261: Merge "Fix NPE during manual refresh" into jb-ub-mail-ur9

* commit '4cc69261374630d8b7977245c6cd360bd61b6e8e':
  Fix NPE during manual refresh