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

* commit '46f38ac35df9b2081dc58bdc8cbb67ad61648f00':
  Correctly handle launch animations for affordances