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