Merge "SF: Test coverage for setupNewDisplayDeviceInternal"