am 4a82a0fc: am f5fa64f2: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev * commit '4a82a0fc': Handle offscreen animations correctly