Merge "Increase timeout limits for UI activities." into sc-dev