Hover master switch (1/2)

Change-Id: I0d58a4d23a4e6e879cf3b8a305945e76d79e3505