Merge "Improve enter and dismiss transition by using snapshot" into udc-dev