Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev