Merge pull request #2413 from sigmabeta/android-lollipop-settings Android: Implement Settings screen in new UI.
