Merge "Moving view capture dump to a service to allow longer timeout" into tm-qpr-dev