Merge "Hide entire hidden field for non-hidden networks" into pi-dev