Merge "Fix truncated text in inline settings" into oc-mr1-dev