Merge \\"Adding a warning dialog before restarting demo session\\" into nyc-mr1-dev am: 33657640ec
am: 43fc5fbd75

Change-Id: I488a74d5b6f7d59b29da84ffed9026d4109619a6