Merge "Update battery saver haptics mode" into udc-d1-dev