Merge "Call applyTransactionOnDraw when removing SV" into sc-v2-dev