Revert "Switch UIMode without reboot"

This reverts commit 4c0abba5f770b88092f882de67402d0265a35490.