Merge "Adding a bug fix flag to guard slider haptics in Compose sliders" into main