Merge change 23372 into eclair

* changes:
  Show the Use location prompt only once if user agrees. Bug #1910370