Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev