Merge "Refactor property change listener code." into udc-mainline-prod