Merge "Fix back animation doesn't work when triggered a second time" into udc-dev