Merge "Fix background tint for Button.Colored on API 22"