Merge "Size smartspace cards dynamically" into main