Merge "Fix: fragment destroyed improperly during pop." into nyc-support-25.2-dev am: 5ba6025392 am: a7aa485fab
am: 4b0ebe0eb2

Change-Id: I6b162f5df10e765fbb956a2f0b7872d97fbeee51