Merge "Fix text anchors" into gingerbread