Merge "Fix copying folders using keyboard shortcuts" into nyc-dev