Merge "Revert "Disable windowOptOutEdgeToEdgeEnforcement if the app targets SDK 36+"" into main