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

Change-Id: I837754712dfe4a3acbc30fccf13d9107842a20aa