am 2a23ef28: am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev

* commit '2a23ef2817bc424c7b1f353394c4653463bd7522':
  Fix SysUI crash on device boot.