Merge "Dynamically Update widget label if widget is selected" into main