Merge "Remove notifications when an app is disabled."