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

* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
  Fix SysUI crash on device boot.