Merge "AML: Handle NoDisplayActivities correctly"