Merge "Fixing invalidate problems in software rendered mode"