Merge change 27058 into eclair

* changes:
  Fix device picker minor bug