Merge changes I0f79cfcd,I22fae1c5 into sc-mainline-prod

* changes:
  Fix local picker media generation result
  Fix PickerUriResolverTests with picker db enabled