Merge "Descreses the counts of windows_change_bounds events" into tm-dev