Merge "Removing Haptic Brightness Slider flag" into main