Merge "Fixing shortcut key duplicate registration bug" into nyc-dev