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

* commit '51f755abfd31e8a41d6121cbeaa7a0727f0ea0ad':
  Fix #6750492: NPE in tablet status bar