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

Change-Id: Ica818b52e20d0fe03766b5dae810f52369140d24