Merge change 20356

* changes:
  Add viewport meta tag to our staged failure code so that they will render correctly.