Merge "Remove enabled flag reset_draw_state_on_client_invisible" into main