Merge "Better handles' visibility test" into ics-mr1