Merge "Fixing bitmap invalidation bug."