Master switch to disable Hover [2/2]

Change-Id: I600a702fa95c842e567d4935eff45f427e5e25b6