Merge "Revert^2 "SensorHAL: add moisture detection"" into main