Merge "Added shortcut key to dock windows" into nyc-dev