Handle the mobile redirect in a slightly nicer way

Change-Id: Ic190af70b1d6ff32b7b0abc074a50c32e4887459
Merge "Handle the mobile redirect in a slightly nicer way" into production