Merge "Don't enable new folder in downloads..." into nyc-dev