Merge "Sync holo button bar styles with UX."