Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev