Merge "Fix deadlock on CompatConfig.mChanges" into sc-dev