Merge "Get rid of logic that clears sync point when layer is hidden"