Merge "Corrects invalidation logic for layered views" into jb-dev