Merge "Add glyph rerasterization hack for SystemUI."