Fixing up handling of shortcuts

Change-Id: I70dd044b608f4ef18a9c436964a11122168305d0
2 files changed