Merge "Fix intent resolver height calculation" into rvc-dev