Merge "Revert "Detect an activity "replacement" transition and animate accordingly"" into udc-qpr-dev