Added ability to turn label visibility ON/OFF

Change-Id: I61daf6d493a177014c7735053be2a76145f02c37