am 678f7edd: Merge "Avoid SystemUI crash due to NPE"

* commit '678f7edd140f3914655bc600d207d3dcb986f881':
  Avoid SystemUI crash due to NPE