Merge "Adding PHOTO_URI and PHOTO_THUMBNAIL_URI."