Merge "Fix comment on VisibilityLocationProvider"