Merge "Change to use new WaitForProperty API"