Fix: fragment destroyed improperly during pop. am: 37e785570b am: 1d0969951a
am: 84d8e4ef88

Change-Id: I4d23e465fe4dbeeb3be372fa970ed992cb6ffa58