Merge "Update task-on-home flag to task for every activity launch"