Merge "Revert "Update Split button visibility based on DeviceProfile change"" into main