Merge "Creating separate flags for Time/QuotaControllers." into qt-dev