Merge "Don't cancel by UID when an app is disabled or uninstalled" into oc-mr1-dev