Merge change 8699 into donut

* changes:
  Prevent SDK updater dialog from showing offscreen.