Bug 861494 - Fix timing issue with activity.