Merge "Reduce the size of dirty invalidates" into jb-mr2-dev