Merge "Workaround to avoid polygon flashing DO NOT MERGE" into lmp-preview-dev