Merge "Fix injection in ContentProvider" into sc-dev