Do not show extra form if it does not contain any visible inputs

Change-Id: Ieece34b310fb41c68c37c57a2ca6ad7837a660f6