Merge "Fix widget picker crash" into udc-dev