am c46a830a: (-s ours) am 828d8c23: Merge "Wire up the quirk for merging multiple <meta viewport> tags" into klp-dev

* commit 'c46a830a4bc20f29241811414f224a867a87ea0b':