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

Change-Id: I7e49d558cc83b750331d1b60f6528afdf47ec6d7