Merge "Fix people widget crash" into udc-dev