Merge "Avoid to hold a strong reference to Context object" into tm-qpr-dev