am 9af1d280: Merge "Fix invalidation bug with INVISIBLE views."

* commit '9af1d280829da4330755b72b539f4f863e5ff3ff':
  Fix invalidation bug with INVISIBLE views.