Merge "Fix background tint for Button.Colored on API 22" into nyc-mr1-dev