Bug 1080812 - Fixing performance test issue with screen timeouts
Merge pull request #25033 from eliperelman/bug-1080812-v2.0

Bug 1080812 - Fixing performance test issue with screen timeouts