Merge "Update screenshot saving strings." into pi-dev