Merge "Update ActivityTransitionTests for shell transit" into tm-dev