Merge "Include insets in bounds with restricted aspect ratio" into sc-dev