Renames all references to the demo folder and changes it to "project"
Update module to track 4.4 branch with latest cherry picks.