Merge "Enable the demo launcher package as well." into nyc-mr1-dev