Merge "Make the widget option on the PopupContainer full width" into tm-dev