Restore edit section links after a successful save

Change-Id: I2349d4f875a51d5def819155faff47ead1bca9bc
Merge "Restore edit section links after a successful save"