Merge "Skip default animation of embedded activity for scene transition" into udc-dev