Merge "ActivityView animations!" into rvc-dev