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

* commit '2dc97d48b924e0ea196404d5adbe5084b344d25e':
  Avoid SystemUI crash due to NPE