Function to turn off on-demand intelligently for an app

The following might be a good replacement for the switch.
One checkbox for app enabling, the other for on-demand.
![Proposal](https://f.cloud.github.com/assets/3158606/2182490/a4a9eb8a-978c-11e3-84d3-70039f5ad736.png)