Merge "[SP29.1] Simplify logic of calculating and applying data limit" into sc-dev