This has become a serious bit of confusion, also now google seems to index any photos and videos inside of google drive into photos. Which is not the behavior you would want. I wish they just went back to only picasa, its really been the only good photo management situation