Bug 45996: Always redirect to page user was on

Change-Id: I1553ee71f4f9ffec8462e3f9b85de9f39d921204
Merge "Bug 45996: Always redirect to page user was on"