Merge "MediaStore should reflect state on disk."