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: If6d5cb161e5ed9633a2719f07943f9419d2f4a09