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

* commit '9bc9469807703757f50fffd34ed6b3f6183cdc6e':
  Fix SysUI crash on device boot.