Merge "Avoid destroying Device separately" into nyc-dev