Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev

* changes:
  Improving the Reset Demo Warning dialog
  Enabling auto-ota in retail demo mode