<LinkedForm> tag now only added to XML if there's a value

Change-Id: I2b061f3266c3ea367eb6fb689f69706a0a9b1c0a