Merge "Always apply postDrawTransaction started during sync" into sc-v2-dev