Merge "Fix deadlock between AppOpsService and HistoricalRegistry."