Merge "Allow devices to calculate their own split ratio instead of using fixed ratio" into main