Merge "Adjusting MSDL vibration attributes for consistency with constants." into main