Merge "Fix few UI bugs in widget picker." into sc-dev