am a6d94e8d: am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev

* commit 'a6d94e8dfe7a251066b74bb3f3a6722e0c2713b5':
  Increase screenshot timeout.