Merge "Remove ACTIVE_UNLOCK chipbar flag" into udc-dev