Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev