Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev