Merge "Fix ViewGroupOverlay's handling of invalidating viewgroups"