Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev