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

* commit '4c3bbb1d90c5f5caf2e1c19a2aa3978d5a04abfb':
  SF: Clear local sync points on hide and destroy

Change-Id: Ie15afeffa22354d95e3c2d7f8041033ef023527e