Merge "Stop previous notification vibration on new buzzy notification" into main