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

* commit '3fee3eb7e0a83cd7fc8df3994692232ba6953c02':
  Don't display based on a dummy animation.