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

Change-Id: Ib7ecd54f85c22d7f2cf88d254ea5b746641c6e64