that need to be wrapped in VclPtr, and convert several sites

Change-Id: I1fb1ed164a99642a0c1ccbf433eb14df688fa476