Merge "Handle edge cases for haptic feedback on shade opening." into tm-qpr-dev