Merge "Optimize invalidate() calls." into honeycomb