Merge "Use visible paths when cleaning up MediaStore." into nyc-mr1-dev