WIP: [Card 446] Don't vary page HTML on X-Device

Change-Id: I485dbb2e9c2a8c1443c10cb297984407fe523bf8
Merge "WIP: [Card 446] Don't vary page HTML on X-Device"