Merge "Fix some heights" into rvc-dev am: da9e2099de
am: d3b025ae8a
am: 564ccd762c
am: c37b11451e
Change-Id: If3e728535d66f95d33674dda5d61b199e9f84c82
This commit is contained in: