Merge "Fix scroll view size to match parent" into main