Merge "Always submit after texture uploads" into sc-dev