Merge "Fix Button + custom tint pre-Lollipop"