Merge "Moving to aconfig flag to control the haptic brightness slider plugin" into main