Merge "Include recommended widgets table vertical padding in the height estimation" into sc-dev