Merge changes I366d5f63,I76d9c952 into sc-dev

* changes:
  Create a WatchedIntentFilter
  Create a snapshot cache utility