Merge "Fixed animation type for animation on the navigation bar." into tm-dev