Merge "Set high_perf_lock_deprecated = true by default" into udc-dev