Merge "Stop using blocking invoke for lock and editConfig."