Merge "Fix random systemui crashes during boot"