Merge "Reduce extra connections made to app" into tm-qpr-dev