Merge "Always show global actions on the right" into oc-mr1-dev