Merge "Fix SysUI NPE crash during the boot/init progress" into sc-dev