fix field enum fillWidth when different font family/size/weight
(cherry picked from commit f0270f54b8eea43f9e4633d183abaa901eccadcf)
fix grid column container insertion at the end when grid is selectable
(cherry picked from commit 384d3bd258884bf09effb72ee2e8c909b1e3bc57)