Revert "Refactor TextEntry - avoid using TextField::textTopMargin & background"

This reverts commit abb854dc96060bf1ea3540a3d63ce6f85f9e124b.