Merge "Increase the timeout for contextual card loading." into rvc-dev