Merge changes Ic7998fd4,I83af7b83 into udc-qpr-dev

* changes:
  Refactor SysUiStatsLogger
  Remove unused context in StatsLogUserEventLogger