Merge "Fix QuotaController constants." into qt-qpr1-dev