Merge "dual-mode switching single/multiuser ServiceWatcher"