Merge "Update task affinity and parent activity for all exported activities."