Merge "Fix up new insets dispatch behavior"