Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev