Merge "Fix intent resolver height calculation" into rvc-dev am: 48eec146dc

Change-Id: I5bc1fccb8440700508cee2bf3db6d2f1df541d9b