Merge "Fix bug 5078498 - Icons jump around on split action bar"