Merge "Reland "Keep runtime insets types during layout"" into sc-dev