Merge "Merge "Fix clipping of large global actions items" into oc-dr1-dev am: e7e2f36a47 am: 231dc0eabd"