Merge "Handle renamed "super" device correctly"