Merge "Resolve unmapped document when the device is connected." into nyc-dev