Merge "Synchronize surface transaction" into sc-v2-dev