Merge "AML: Do not merge launch events on different displays"