Merge "Keep runtime insets types during layout"