Merge "Fix dialog exit animation" into tm-dev