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

Change-Id: I796f7653f8ca0dd2b7cd0608cdb4d9464ae06373