Merge "Defer finish() to onStop() when doing shared transition" into udc-qpr-dev