Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev