Merge "Reverting changes from ag/24270073 to go back to previous Chipbar haptics." into main