Merge "Fix bug where suggested widget overlaps widget list" into udc-qpr-dev