Hover master switch (2/2)

Change-Id: Iac98d3f75da5d3bd912e743f6a4c562079460d4d