Merge "Adding a flag for enabling new haptic components in the brightness slider." into udc-qpr-dev