Merge "Filter out potential null widget item from recommended widgets" into sc-dev