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