Merge pull request #6142 from gwicks/android-settings Android: Add Slot A and B Device settings to the settings UI