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

* commit 'f9d194e07bb8af26983ac96681887874a8782099':

Change-Id: I8b48dcf6ddfb9b4f916d89bc702c15af900a4a8c