Add iOS hover bug fix

So hacky! :-)
Bug: 64669

Change-Id: I16a0bdbf76556c1f85993ff37f3661617956443e
Merge "Add iOS hover bug fix"