am e30e98f8: Merge change 8699 into donut

Merge commit 'e30e98f82189386dbf603750f37f3bc8a6078a22'

* commit 'e30e98f82189386dbf603750f37f3bc8a6078a22':
  Prevent SDK updater dialog from showing offscreen.