Merge "Fix issues with photo selection on Prime."