Fix two shortcut manager issues
am: 1e1732399a

Change-Id: Ie4ea05bbfd65c3bb2bcbefab234fa5c56443dba4