Merge "Fix bottom hun content position" into tm-dev