Merge "Settings: Material Black" into lollipop