Merge "Fix shape and grid content height" into main