Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread