Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev