Minor cleanup.

We set appropriate Active state in OnActivationChanged. However,
Activate and DeActivate where doing the same even though they
eventually call OnActivationChanged. This patch removes the redundant
flag setting.