Merge "Fix regression in SysUI boot time"