Merge "Fix random systemui crashes during boot"
am: 8078996f4a  -s ours

Change-Id: I97b1d904c2e37aff4ade169d0f76d7f0d123fc5b