Merge "Use longer timeout for reportShown call" into sc-qpr1-dev