Merge "Update theme setting to not require reboot"