Merge "Re-add scale and resolve to VibrationEffect" into main