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

* commit '4a82a0fc09f4743b59b5de483329fb76e60aab07':
  Handle offscreen animations correctly