Merge "Fix NPE in WidgetsTwoPaneSheet" into main