Simplify linkWithReturnTo helper

Change-Id: Iddfeebaa6fac46dbbd843474914305837d7732cb
Merge "Simplify linkWithReturnTo helper"