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

* commit '8ceb1188f17826088695ed488ad0ab58ec22afa2':
  Fix SysUI crash on device boot.