Merge "Hook up custom activity-level animation callbacks to shell" into sc-v2-dev