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

Change-Id: I07dca777edd3264c7bf8d6e110804d2e7df3cc97