Merge "Fix global actions dialog order"