Fix signal hide after 6-bar patch and code cleanup

Hide signal works ONLY with stock bars

Change-Id: I5ed12d6797d5b0df7ceeaa6ea6e812e7ad533fb4