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

Change-Id: I127449a35817ad15cd72e0565cfc3a82efd13808