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

* commit '54ebc564132c4c734d5917baa5c91a36c6f915ef':
  SF: Clear local sync points on hide and destroy

Change-Id: Ife257492cfa0c34e67fae6568a3b9aee2570c8f8