Merge "Disable share when dirs selected." into nyc-dev