Merge "Enable the flag that guards the talkback fix" into udc-dev