Preserve URL parameters when toggling view

Bug: 64318
Change-Id: I770c131f9132802cb3891089bce18a07c5c48cb4
Merge "Preserve URL parameters when toggling view"