Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev