Merge "Fix clipping of large global actions items" into oc-dr1-dev