Merge "Remove disable_custom_task_animation flag"