Merge "Revert "Persist permission state for updated apps synchronously.""