Merge "Fix invalidation bug with INVISIBLE views."