Merge "Clear hyphenEdit from Layout's paint"