Merge "Use IntrusiveForwardList<> for Env-/UsePosition."
am: c0fe9db1af

Change-Id: Ia0c2f609b7145311bcec5ca187e0158187c6518c