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

* commit '90abb78b51a35055f86dee35c4e391e74f325125':
  Avoid SystemUI crash due to NPE