Merge "Fix mNoAnimActivities"