Merge "Directly assign mDepth" into sc-v2-dev