Merge "Fix null pointer in FloatingWidgetView" into 24D1-dev