Merge "Consolidate animation to show divider bar" into tm-dev