Merge "Set cutout mode to shortEdges on flicker"