Merge "Initialize content resolver in ctor" into sc-v2-dev