Merge "[snapshot] skip onChanged() in Watched* snapshot()" into tm-dev