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

* commit 'a45b03f85cdfa792122a9301d508e106ce6aa6f6':
  ActivityTransition: fix activity not finished on back