Merge "Screenshots: delete, default for edit intent." into pi-dev