Merge "Consolidate size compat bounds calculation" into rvc-dev