Merge "Revert "Temporarily disable SUW specific insets logic""