Merge "Fixed bug where adding a stats record freeze the UI." into idea133
 Auto-merge: 32cacb4

* commit '32cacb4b50cac0764041ea026c8ae358cb454aac':
  Fixed bug where adding a stats record freeze the UI.