Merge "Change visibility check to WC.isVisible" into rvc-dev am: f16e13cc01

Change-Id: I57f54e63f15c0356bf2111d08ff2af6a32a5c569