Merge "[Screenshot] Extend timeout on user interaction" into 24D1-dev