Merge "Clear mForceTraversal" into sc-dev