Merge "Dirty rect must expand, not contract." into jb-mr2-dev