Merge "Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f13231 am: d5b15bb081" into rvc-d1-dev-plus-aosp