am dcc81035: am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev

* commit 'dcc81035423c1c221409f20b28ba94a8ca74d55d':
  Corrects invalidation logic for layered views