am 81de5a0b: Merge "Stop animating when not showing." into jb-dev

* commit '81de5a0b11df08b603693b6d3b381ac9f89ebc67':
  Stop animating when not showing.