am 0b30bccd: Merge "Fix a NPE when the up button is pressed" into jb-ub-mail-ur9

* commit '0b30bccddbc7510a163ff7e2e0d96ddc7bafacf4':
  Fix a NPE when the up button is pressed