add when_visible to reduce false failures

Change-Id: I1c2551f84b8048324f8559247c7125818f580e7f
Merge "add when_visible to reduce false failures"