Merge "Revert "Add flag to guard WM Extensions for all devices"" into main