Merge "Fix null pointer in FloatingWidgetView" into main