Merge "Change <vibration> to <vibration-effect>" into main