Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9 am: 0d9c6a8f am: 9ac5a810 Change-Id: Ib6b47d44a6be3e024478c6be2e0c412eae51d780