am 4c3133a2: am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev

* commit '4c3133a2d1142ca5bf5d6165d32621cc22b34392':
  Correctly handle launch animations for affordances