[US13.2] Bug fix mac flickering