Merge "Update buttons in pin widget picker." into sc-dev