Return to the original page requested, after Persona login

Bug 1331319

Change-Id: I26c58fc9ddde2c2a7c3c3b0c3d418e7872b01a88
Merge "Return to the original page requested, after Persona login"