Preparing for the demo
Fix demo by moving restore op before onStart