Merge "Fix restoring animator_duration_scale back to default"