Merge "Remove UserHandle ivar from ResolverListController." into tm-qpr-dev