Merge "Update screenshot saving strings." into pi-dev am: 644ded01dd
am: f3da2369c9

Change-Id: Iee45ad79955ec2365e4689eaf3d4dc69160a94e3