Merge "Update default activity animation" into udc-qpr-dev