Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1