Merge "ActivityTransition: fix activity not finished on back" into lmp-dev