Merge "Show suggested widgets header only when there are suggested widgets" into udc-dev