Merge "Optimizing View capture logic" into tm-qpr-dev