Merge "Fix padding in global actions list item" into jb-mr1-dev