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

Change-Id: Ibf5098d39349a024509a764373ea0bfb8d18d8be