Merge "Fix SysUI crash on device boot." into mnc-dev