Merge "Disallow disable / hide device provision app" into nyc-mr1-dev