Merge "Update package name for PictureAndPictureSettings"