Merge "Extend timeout for waiting for views"