Merge "Adding a warning dialog before restarting demo session" into nyc-mr1-dev