Merge "fix(photopicker): ignores top level screenshots dir." into tm-mainline-prod