Avoid section edit links when needed

Change-Id: I3199929071fb262bd5566e03fa8dd76cba5e7854
Merge "Avoid section edit links when needed"