Merge "Quick affordance gesture polish and haptics." into tm-qpr-dev