Merge "Perform haptic feedback on nav button key press" into tm-qpr-dev