Merge "Hide TARE page when disabled." into udc-dev