Merge "Add NEW_LIGHT_BAR_LOGIC flag" into udc-dev