Merge "Fix deadlock caused by two-threaded property controls" into udc-dev