Merge "Prevent double haptics for back events" into main