Merge "Handle openning transition while animating a pair to home" into udc-dev