am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev

* commit '5beeb04b528fec320d3453601b4adf4efbd8eba7':
  Don't display based on a dummy animation.