Hover Settings and Upgrades

Change-Id: I6262afb7af2845962a78fa743ef2be8f39419d93