Merge "Resolve vibration effect default amplitude when scale is bypassed" into main