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

* commit 'e787bfa209a4fa6fc2f4cd754492a13472952c5c':
  Fix SysUI crash on device boot.