Merge "Fixed transition animation from pipable activities" into oc-dev