Clean up shortcut picker

First some cleanup before adding new functionality.

Change-Id: I37339bb8967c2136c8361133d38c2f5ad30ae3e2
1 file changed