Merge "Don't back up disabled apps" into oc-dev