Merge "SF: Clear local sync points on hide and destroy" into nyc-dev am: 54ebc56413 am: 4c3bbb1d90
am: 0b3b7b421b

* commit '0b3b7b421b34cf86892640926f5e1fcd326470f4':
  SF: Clear local sync points on hide and destroy

Change-Id: I5618df1f1a5d2e8bf6820afaf33754f867fc66d1