Merge "Fix deadlock on CompatConfig.mChanges"