Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev