Merge "Fix no AVD transfer to client when using setOnExitAnimationListener" into udc-dev