Merge "Check glyphs are laid out in text-view." into devel/master