(bug 42030) Include original URL params in variant links

Change-Id: Iaedb56445b97ee09bd7fa08c9f23cd147757dee4
Merge "(bug 42030) Include original URL params in variant links"