Merge "Removing some unnecessary interfaces and merging them to ActivityContext" into tm-qpr-dev