Merge "Fix ClearHighlight() for custom highlight frames" into devel/master