Merge "Add adaptive haptics scaling to external vibrations" into main