Merge "Handle offscreen animations correctly" into jb-mr1-dev