Merge "Enforce parent outline for widgets" into main