am f8e933f9: am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE"

* commit 'f8e933f9882e7ee627c7189e4ab650a20531e58a':
  Avoid SystemUI crash due to NPE