Merge "Disable expanded udfps overlay in enrollment when using talkback" into udc-dev