Merge "Install preloaded apps into the demo user" into nyc-mr1-dev