Merge "Update ShadowContentResolver to extend from the official shadow package. Also removes redundant API" into main