Merge "SF TimeStats: flush and clear layer timestats on layer tear down"