Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev