Merge "Do not synchronizeNextDraw in phone mode" into main