Merge "Don't call isMediaSharedWithParent() on pre-S builds." into sc-dev