Merge "Invalidate display lists immediately when views are removed/added quickly" into jb-dev