Fix two shortcut manager issues am: 1e1732399a am: 07974e4f56
am: 4aa8d8b0f0

Change-Id: Ic0b8e958833b301f7809951c24ca3809a3797700