Merge "Revert^2 "Add device state Hal service"" into main