Merge "Revert "Revert "Move TentModeDeviceStateProvider to shared direc..."" into main