Fix a regression related to optimizing invalidation in scrolling views. Change-Id: I6a39075dc830d78436a274935a904a32084defac