Merge "Simplifying widget cell layout" into udc-dev