Merge "Updating the cached resource configuration if ViewRoot is perserved" into tm-qpr-dev