Merge "block:row: fix idling mechanism in ROW"