Merge "Refactor the floating header's positioning." into tm-dev