Merge "add base::WaitForPropertyCreation"