am 268aeac2: Merge "Fix NPE in MailActionBarView" into jb-ub-mail-ur9

* commit '268aeac2b6265b0c54259dcff767fba6a5d90ccd':
  Fix NPE in MailActionBarView