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

* commit 'cb3262403420417f355aacde93e0e43493e510f6':
  Correctly handle launch animations for affordances