Merge "Add vsyncId to transactions"