[Bug 225617] Merge Review: bitmap-fonts