Merge "Add ability to filter remote animation adapter by activity type" into pi-dev