Merge "Switch demo to use new delete observer"