Merge "Reduce ServiceWatcher thrashing"