Merge "Don't display based on a dummy animation." into jb-dev