Merge "Update colors for widget picker" into udc-dev