Merge change 8002

* changes:
  Prevent EAS startup race condition while debugging