Merge "Add demo mode to dev options" into nyc-dev