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

* commit 'a11713ce3e81d7838092168fad110bea3212a9f3':
  Increase screenshot timeout.