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

Change-Id: I0b5af0b44be47a5679e5fcbe9428012a95e152bc