Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev