Merge "Remove forwarded insets"