Width and widget size support
Conflict merge