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

* commit '99e951155e4faaf83ff4a8195345e6a4130bc02a':

Change-Id: Id8d949e93d250dd9eb259d81eb237711b34d421d