Merge "Stop animating when not showing." into jb-dev