Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev