Merge "Merge "Add hover event handling to new touch architecture" into tm-qpr-dev am: f8832235 am: fb9ff85c"