Merge pull request #2576 from sigmabeta/android-controls Android: Persist previously-set controller bindings on the Settings menu.