Merge "Increase screenshot timeout." into jb-mr2-dev