Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev