Merge "Implement merge animations for AE Shell animation." into udc-dev