am 9a8a28aa: Merge "Fix #6750492: NPE in tablet status bar" into jb-dev

* commit '9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083':
  Fix #6750492: NPE in tablet status bar