Merge "Transition: Don't suppressLayout(false) for returning activity" into lmp-dev