Merge "Recalculate view's height when tab is selected" into tm-dev