Fix errors in 9aa5d9f

Fixed accidental deletion of StartActivity in DeckPicker, and improved fix for Issue 2166 after some testing