Merge "Change vibrator flag namespace to haptics" into main