Merge "Fix two shortcut manager issues" into nyc-mr1-dev am: fc13448507
am: c36175ac19

Change-Id: Ic5ab1168fe12dab655eebc81836e0637b0026d91